Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 18:19:35 +0000 (11:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 18:19:35 +0000 (11:19 -0700)
commit402c6e25794a6f09446fea8b6b308ce8f8df4874
tree9298646f25be9c5f0397be761607437d0e388ae5
parent3b1cc40f36110e64a1443d4fda1d38634911ff6c
parent5d6d8e1a6dba361059d7781f03e3849d5c687971
Merge from trunk.
src/ChangeLog
src/buffer.c
src/image.c
src/window.c
src/xfns.c